Merge version 5.4.0-2+rpi1 and 5.4.0-3 to produce 5.4.0-3+rpi1

diff --cc debian/changelog
index ad1a1ba444c2d86751da7c463c7c695eecd44cb1,9b49b021227eef8dc15bfec6b6e3ca9e4fb5b13b..f1a6a6fb3f98820a5af7312c027f65981c97b40a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,11 +1,25 @@@
- ocaml (5.4.0-2+rpi1) forky-staging; urgency=medium
++ocaml (5.4.0-3+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 4.08.1-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 26 Nov 2019 19:38:59 +0000]
 +  * Revert previous raspbian changes, changing the triplet 
 +    now seems to cause more problems than it solves (specifically
 +    it causes ocaml to try and use nonexistant compilers).
 +  * Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
 +  * Partially fix clean target.
 +
 +  [changes introduced in 4.08.1-5+rpi1 by Peter Michael Green]
 +  * Remove gitattributes that cause problems for dgit.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 15 Jan 2026 04:00:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Feb 2026 21:33:54 +0000
++
+ ocaml (5.4.0-3) unstable; urgency=medium
+ 
+   * Remove transitional packages (Closes: #1125099)
+   * Clean up Breaks/Replaces fulfilled by stable
+   * Remove MANIFEST and "debian/rules regenerate"
+   * Fix /usr/local/lib/ocaml ownership (Closes: #982067)
+ 
+  -- Stéphane Glondu <glondu@debian.org>  Wed, 11 Feb 2026 14:40:10 +0100
  
  ocaml (5.4.0-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge